From 2659e3fbf5e51e58a5542d64e621ad3fc2359f02 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Mon, 23 May 2005 05:25:45 +0000 Subject: [PATCH] bitkeeper revision 1.1508 (42916959z-L_1fAuVkGLI_kRj1O2VA) Some more ioemu config hardcoding. Our 'target arch' is always i386. Do we really need linker scripts?? Signed-off-by: Keir Fraser --- .rootkeys | 3 +- tools/ioemu/configure | 9 +- tools/ioemu/i386-vl.ld | 140 ---------------------------- tools/ioemu/target-i386-dm/Makefile | 7 +- tools/ioemu/{i386.ld => x86_32.ld} | 0 5 files changed, 9 insertions(+), 150 deletions(-) delete mode 100644 tools/ioemu/i386-vl.ld rename tools/ioemu/{i386.ld => x86_32.ld} (100%) diff --git a/.rootkeys b/.rootkeys index 86ebc2f779..4ba4305d4b 100644 --- a/.rootkeys +++ b/.rootkeys @@ -606,8 +606,6 @@ 428d0d85hp-zgN40hVYXWRjhInkUkg tools/ioemu/hw/vga.c 428d0d85G_4S-hpRyrhV4yGjSrS-cQ tools/ioemu/hw/vga_int.h 428d0d85oWl1ONX_gIZWS1fXjeXGlA tools/ioemu/hw/vga_template.h -428d0d85-wAtLF5FYFHCUAxXKNbEkA tools/ioemu/i386-vl.ld -428d0d85d831iQvvCD3LcaOD9rYGkg tools/ioemu/i386.ld 428d0d85_mNnFPE8hnoC3VvBD9CCuA tools/ioemu/keyboard_rdesktop.c 428d0d85SyOIeDg3SoxH2BiBpXWWkA tools/ioemu/keymaps/ar 428d0d85ToGTVvPrl8hKAi2QxCzp2w tools/ioemu/keymaps/common @@ -676,6 +674,7 @@ 428d0d8bgAojEQcAcTV2gj2E_eG4Lw tools/ioemu/vl.c 428d0d8bXiCY4iTjoSPxGry8jXdAtg tools/ioemu/vl.h 428d0d8bQVKedvN5EIPm39s33TXkpA tools/ioemu/vnc.c +428d0d85d831iQvvCD3LcaOD9rYGkg tools/ioemu/x86_32.ld 428f0763_67jCiHbdgfGlgAOJqfg9A tools/ioemu/x86_64.ld 3fbba6dbDfYvJSsw9500b4SZyUhxjQ tools/libxc/Makefile 41dde8afKYRKxS4XtLv1KUegGQy_bg tools/libxc/linux_boot_params.h diff --git a/tools/ioemu/configure b/tools/ioemu/configure index 3afb9dee9e..0ddebef64e 100755 --- a/tools/ioemu/configure +++ b/tools/ioemu/configure @@ -513,12 +513,9 @@ echo "/* Automatically generated by configure - do not modify */" > $config_h echo "include ../config-host.mak" >> $config_mak echo "#include \"../config-host.h\"" >> $config_h -if test "$target_cpu" = "i386" ; then - echo "TARGET_ARCH=i386" >> $config_mak - echo "HOST_ARCH=`uname -i`" >> $config_mak - echo "#define TARGET_ARCH \"i386\"" >> $config_h - echo "#define TARGET_I386 1" >> $config_h -fi +echo "TARGET_ARCH=i386" >> $config_mak +echo "#define TARGET_ARCH \"i386\"" >> $config_h +echo "#define TARGET_I386 1" >> $config_h interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"` echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h diff --git a/tools/ioemu/i386-vl.ld b/tools/ioemu/i386-vl.ld deleted file mode 100644 index 428fe83e12..0000000000 --- a/tools/ioemu/i386-vl.ld +++ /dev/null @@ -1,140 +0,0 @@ -/* ld script to make i386 Linux kernel - * Written by Martin Mares ; - */ -OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") -OUTPUT_ARCH(i386) -SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/alpha-unknown-linux-gnu/lib); -ENTRY(_start) -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - . = 0xa8000000 + SIZEOF_HEADERS; - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.text : - { *(.rel.text) *(.rel.gnu.linkonce.t*) } - .rela.text : - { *(.rela.text) *(.rela.gnu.linkonce.t*) } - .rel.data : - { *(.rel.data) *(.rel.gnu.linkonce.d*) } - .rela.data : - { *(.rela.data) *(.rela.gnu.linkonce.d*) } - .rel.rodata : - { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } - .rela.rodata : - { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - .init : { *(.init) } =0x47ff041f - .text : - { - *(.text) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - *(.gnu.linkonce.t*) - } =0x47ff041f - _etext = .; - PROVIDE (etext = .); - .fini : { *(.fini) } =0x47ff041f - .rodata : { *(.rodata) *(.gnu.linkonce.r*) } - .rodata1 : { *(.rodata1) } - .reginfo : { *(.reginfo) } - __preinit_array_start = .; - .preinit_array : { *(.preinit_array) } - __preinit_array_end = .; - __init_array_start = .; - .init_array : { *(.init_array) } - __init_array_end = .; - __fini_array_start = .; - .fini_array : { *(.fini_array) } - __fini_array_end = .; - - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. */ - . = ALIGN(0x100000) + (. & (0x100000 - 1)); - .data : - { - *(.data) - *(.gnu.linkonce.d*) - CONSTRUCTORS - } - .data1 : { *(.data1) } - .ctors : - { - *(.ctors) - } - .dtors : - { - *(.dtors) - } - .plt : { *(.plt) } - .got : { *(.got.plt) *(.got) } - .dynamic : { *(.dynamic) } - /* We want the small data sections together, so single-instruction offsets - can access them all, and initialized data all before uninitialized, so - we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } - _edata = .; - PROVIDE (edata = .); - __bss_start = .; - .sbss : { *(.sbss) *(.scommon) } - .bss : - { - *(.dynbss) - *(.bss) - *(COMMON) - } - _end = . ; - PROVIDE (end = .); - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - /* These must appear regardless of . */ -} diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile index 6d596d4a82..300cfed128 100644 --- a/tools/ioemu/target-i386-dm/Makefile +++ b/tools/ioemu/target-i386-dm/Makefile @@ -1,4 +1,7 @@ +XEN_ROOT=../../.. +include $(XEN_ROOT)/tools/Rules.mk include config.mak +override TARGET_ARCH=i386 #assume we directly put qemu code in tools/, same level as bochs dm(ioemu) XEN_PATH=../../.. @@ -186,7 +189,7 @@ endif ######################################################### DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -LIBS+=-lm -L$(XEN_PATH)/dist/install/usr/$(LIBDIR) -lxc -lxutil +LIBS+=-lm -L../../libxc -L../../libxutil -lxc -lxutil ifndef CONFIG_USER_ONLY LIBS+=-lz endif @@ -300,7 +303,7 @@ VL_LDFLAGS= ifdef CONFIG_STATIC VL_LDFLAGS+=-static endif -VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(HOST_ARCH).ld +VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(XEN_TARGET_ARCH).ld ifndef CONFIG_DARWIN ifndef CONFIG_WIN32 VL_LIBS=-lutil diff --git a/tools/ioemu/i386.ld b/tools/ioemu/x86_32.ld similarity index 100% rename from tools/ioemu/i386.ld rename to tools/ioemu/x86_32.ld -- 2.30.2